Merge "Use proper kwargs in rebuild_server"