Merge "Fix rebuild_server() function"