Merge "Fix Mapper Protected test" into rvc-dev