Dev fix property condition

Nico Bugl requested to merge dev_fixPropertyCondition into dev

Merge request reports