Merge "sonar blocker issue fixes"