Handle properties
Merge branch 'feature-property' into develop