43616-173 Mask-to-feature bugfix