Re #10803 Brought changes to properties from #10817