Merge "Change server create to use tracked create_server"