MockObject fixes

Closes #3579136

Merge request reports

Loading