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

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