U4-4676 - fix property alias corruption issue
Merge remote-tracking branch 'origin/7.1.2' into 7.1.2