Merge "Fix sonar issues in Mapper1_0"