Fixed formatting of service on Enable/Disable action
Merge branch 'batch-9' into dev