Mockobject fixes

Closes #3579870

Merge request reports

Loading