Merge "Cleanup: Add common "create_server" method"