Merge "Control Service - Fix typo"