Merge branch 'feature/property-system-aliases' into 'master'

Merged Timo Koch requested to merge cherry-pick-64e4102f into releases/3.7

Merge request reports