Merge pull request #2117 from Numpsy/ObjectSecurity