merge queue: embarking main (a06c189), #10817, #10820, #10821, #10823 and #10829 together

merge queue: embarking main (a06c189), #10817, #10820, #10821, #10823 and #10829 together #12826