Merge "Fix violation reported by sonarqube"