Merge "fixed Sonar issues"