Mockobject fixes

Closes #3579864

Merge request reports

Loading