Mockobject fixes

Closes #3579854

Merge request reports

Loading