merge queue: embarking main (c5bb50b), #2169, #2038, #2170 and [#2184 + #2156 + #2154] together

merge queue: embarking main (c5bb50b), #2169, #2038, #2170 and [#2184 + #2156 + #2154] together #7352