chore: update with 1.4 branch stuff

Not to be landed until after the first 1.4.x release