Merge "added more fixes to the failed sonar issues"