Re #10817 Lost in branches changes to DirectPropertyManager
Re #10817 lost changes again
Merge branch 'bugfix/10817_errorHardmaskPlus' into develop