Merge "Sonar majior issues"