Resolve #3516158 "Mapped object"

Scott Euserrequested to merge
issue/salesforce-3516158:3516158-mapped-object into 5.1.x

Closes #3516158

Merge request reports