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

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