Preparing a new patch for 24.0.42 following APR-165
Cherry-pick !74572 (merged) !74583 (merged) and !74615 (merged) for a new patch in 24.0.42 Also adding !73257 (merged)
Edited by Jean-Baptiste De Vivie De Regie
Cherry-pick !74572 (merged) !74583 (merged) and !74615 (merged) for a new patch in 24.0.42 Also adding !73257 (merged)