Merge 23c1-branch back into the head. Barry will send email about the

New Plan (releases to be made off the head, ongoing random 2.4 stuff
to be done on a short-lived branch, provided anyone is motivated enough
to create one).