style fixes
Merge branch 'object_properties' into development