Merge "Add server name check for multiple creations"