Merge "Revert "Remove circular mask"" into klp-modular-dev