MockObject fixes

Closes #3579172

Merge request reports

Loading