Fixed editable properties
Merge branch 'develop' into 3264-systemproperties-editable
Merge branch '3264-systemproperties-editable' into develop