merge queue: embarking main (73e9e30), #2157, #2163, #2158, #1747 and [#2178 + #2154] together

merge queue: embarking main (73e9e30), #2157, #2163, #2158, #1747 and [#2178 + #2154] together #7330