2.1.6 backport commits #948

Job	Run time
build (ubuntu-latest, 4.02.3)	7m 29s
archives-cache	19s
build (ubuntu-latest, 4.03.0)	7m 49s
build (ubuntu-latest, 4.04.2)	8m 22s
build (ubuntu-latest, 4.05.0)	8m 3s
build (ubuntu-latest, 4.06.1)	7m 54s
build (ubuntu-latest, 4.07.1)	7m 54s
build (ubuntu-latest, 4.08.1)	2m 52s
build (ubuntu-latest, 4.09.1)	3m 20s
build (ubuntu-latest, 4.10.2)	2m 57s
build (ubuntu-latest, 4.11.2)	2m 56s
build (ubuntu-latest, 4.12.1)	3m 1s
build (ubuntu-latest, 4.13.1)	2m 59s
build (ubuntu-latest, 4.14.0)	2m 50s
build (ubuntu-latest, 5.0.0~beta2)	1m 5s
build (macos-latest, 4.12.0)	3m 13s
hygiene	10s
cold (ubuntu-latest, 4.12.0)	5m 20s
test (ubuntu-latest, 4.12.0)	12m 32s
upgrade (ubuntu-latest, 4.12.0)	1m 34s
test (macos-latest, 4.12.0)	25m 14s
solvers (ubuntu-latest, 4.12.0, z3)	8m 40s
upgrade (macos-latest, 4.12.0)	2m 30s
solvers (ubuntu-latest, 4.12.0, 0install)	8m 39s
solvers (macos-latest, 4.12.0, z3)	7m 20s
solvers (macos-latest, 4.12.0, 0install)	7m 3s
	2h 32m 5s

Provide feedback