Resolve #3581058 "Mockobject fixes"

Closes #3581058

Merge request reports

Loading