Mockobject fixes

Closes #3579883

Merge request reports

Loading