Merge "[CCSDK] Fix for naming service"