Mockobject fixes

Closes #3579868

Merge request reports

Loading