Now that this repo is public, we can move to a merge queue to avoid time-of-merge vs time-of-branching discrepancies.