Merge "Revert "Fix update of services for multiple backend mode""