merge queue: embarking main (b8927f7), #9787, #9789, #9790, #9791, #9792 and #9796 together

merge queue: embarking main (b8927f7), #9787, #9789, #9790, #9791, #9792 and #9796 together #11575