Auto merge of #17960 - duncanawoods:master, r=HKalbasi #2086

Job	Run time
dist (x86_64-unknown-linux-musl)	9m 39s
dist (x86_64-pc-windows-msvc)	9m 27s
dist (i686-pc-windows-msvc)	10m 20s
dist (aarch64-pc-windows-msvc)	9m 47s
dist (x86_64-unknown-linux-gnu)	9m 20s
dist (aarch64-unknown-linux-gnu)	5m 43s
dist (arm-unknown-linux-gnueabihf)	5m 30s
dist (x86_64-apple-darwin)	6m 26s
dist (aarch64-apple-darwin)	6m 51s
publish	1m 37s
	1h 14m 40s

Provide feedback