Moving objectMapping clearing closer to where they are reset
Fix for issue #1233
Duplicating cached property definitions
Rolling back
bug fix: issue #1234 comments
Merge pull request #1235 from stevewithington/develop

bug fix: issue #1234 comments  
Thanks Steve!