Merge "Add way to select arena type at runtime"