Merge "changes needed in Service Distribution"