Mockobject fixes

Closes #3579890

Merge request reports

Loading