Merge "revert few sonar fixes"