1.6 backport

There was 1 failing test on CI, but that's another issue (which I will look into on a separate branch).