Merge "Fix issues reported by sonar"