Mockobject fixes

Closes #3579858

Merge request reports

Loading