Merge "Fixes sonar issues in CMService"