Mockobject fixes

Closes #3579885

Merge request reports

Loading