Merge "test commit. sonar fixes"