Merge "Add support for naming service"