Branch 12.3

Hopefully this merges stuff to master.