merge queue: embarking main (884690e), #2184, #2180, #2182 and [#2156 + #2154 + #2166] together

merge queue: embarking main (884690e), #2184, #2180, #2182 and [#2156 + #2154 + #2166] together #7177