Resolve #3579906 "Mockobject fixes"

Closes #3579906

Merge request reports

Loading