proper copying of local properties
Merge branch 'develop'