Need to merge:

Backport the following change IDs

• I3deae1cc6bbe5ef5820224f72bb02565677e1ade (https://review.opendev.org/c/openstack/cinder/+/903095)
• I4ff2ee20e4ab82577a3f3cb9ccd07e468981a6f4 (https://review.opendev.org/c/openstack/cinder/+/926475)
• Ib4788d13aa724d86d662442dae344ac0b365374e (https://review.opendev.org/c/openstack/cinder/+/936774)
• I18dc6c8490a8d5771f70310f9ff3f4127e7596e5 (https://review.opendev.org/c/openstack/cinder/+/935824)
• I65b80a9c370fa53b0bf124a94b8bae452f9c29ab (https://review.opendev.org/c/openstack/cinder/+/936773)
• I804ab5a88496b1da82c45ccabdb0fe175aacfbfb (https://review.opendev.org/c/openstack/cinder/+/940269)
• I65c7241febec740d727f330b3bc0ef1b80abdd78 (https://review.opendev.org/c/openstack/cinder/+/933675)
• I5b56c590a6c9b82ab2e08e4211bfd3d187afdf8e (https://review.opendev.org/c/openstack/cinder/+/945631)