merge queue: embarking main (8f48d7a), #9769, #9766, #9767, #9768, #9770, #9773, #9775 and [#9725 + #9758] together

merge queue: embarking main (8f48d7a), #9769, #9766, #9767, #9768, #9770, #9773, #9775 and [#9725 + #9758] together #11555