Merge branch 'feature/property-value' into 'master'

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

Merge request reports