Merge "Fixed major sonar issues"