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