Merge "Use common create_server method for advanced_ops"