Upstream backports:
master: 5018f16c6205404ba3aa7298dc8a3d45fbd46bfc 2.23: 2d1f6790183dabf54c5b05be97d3872dab720c83 2.22: a64be6fb2f1317ce7039a4bb8638bd0c30c31e28
Upstream backports:
master: 5018f16c6205404 ba3aa7298dc8a3d 45fbd46bfc 54c5b05be97d387 2dab720c83 e7039a4bb8638bd 0c30c31e28
2.23: 2d1f6790183dabf
2.22: a64be6fb2f1317c