Merge "convert to resource tracked create_server"