Merge "Backward compatibility change for Configuration Service"