Merge "Sonar fixes in MapperUtil.java"