Mockobject fixes

Closes #3579859

Merge request reports

Loading