Resolve #3579907 "Mockobject fixes"

Closes #3579907

Merge request reports

Loading