Catch-up merge from custom/cet/main to master, to pick up arena extension callbacks.