Merge "Revert "Add server name check for multiple creations""