Merge "Cleanup: use a shared apex_key" into main