Re #6809. Implemented ClearMaskFlag.
Merge remote-tracking branch 'origin/feature/6809_ClearMaskFlag'