Merge "CMService.java - Merge the if statement with the existing one"