Merge "Multi-server handling in base.py"