Fix CompositeBase.destroy() method
Fixes in propertyManagers
Merge branch 'master' into dev