cherry picked removal ov customerservice6 (56e27a61d6)
Merge branch 'hotfix/removeCustomerService'