Merge property basic

Nico Bugl requested to merge MergePropertyBasic into dev

Merge request reports