Re #10836 minor bug in HardMaskOnly implementation