Merge "Enhance naming service support"