Merge "Fixed Sonar issues for Console Logs"