Merge "Fix bugs reported by sonar/nexus-iq"