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