merge queue: embarking main (a2c4c48), #9745 and [#9725 + #9758] together

merge queue: embarking main (a2c4c48), #9745 and [#9725 + #9758] together #11558