Merge branch 'task/JAL-3608_property_set_laf_and_tests' into develop