The commits to be backported: daafa451587b9e1d018f147885f38290a344a65a e2cfe3c6c8483c27b60d9b64e760ba3e8c8a1d43 7640856769d2d687877df720af5ef1ecd8938888 0fc4b4d17bfd0ce44394f6040e1d5f9dfa97a5ad 4ec907c773a807d58b17f909522c27d05878b5b5 64481b3c72d758e8330e742aac95c7b66b863020 21dcb000c8cfe38d3120419e0bd5360855318e55 ee1182d2cbb4930ca1166bc03f3b0fcfbb594145 d31e37d12c58ca3be72e404a222289a896029ef1 e55d735f84364d3b7d38104cee37c968e3797ea4 4298736ddad3e61dee2d379c8042f304317a6f3c 4dfae1adb31440a37e2183626518f1373eb38b15 ced8722f7d98c946d1429e46252ccc061272d0db a668a94238dc67b19ae187b52a161e027d79ee5d faf53c197cabeb1eb0fd1f66cd001d1469ebac09 2dd78251ff0c4009b478574cca7aef2eb05c2279 876563c824bdecbf771a0e7bda472b0a1c19d900 f8d07a7354a3fee1e30073aa7ac2efb89ef4e782 aa18b7857c095395645be322e98347c86e01648d fb6b577bbe8f7990b33bba5b0b925bdcb494d606