merge queue: embarking main (23038c2), #10144, #10145, #10146 and [#10147 + #10149 + #10150 + #10151] together

merge queue: embarking main (23038c2), #10144, #10145, #10146 and [#10147 + #10149 + #10150 + #10151] together #11969