merge queue: embarking main (8f6b016), #2079, #2083, #2077, #2052 and #2073 together

merge queue: embarking main (8f6b016), #2079, #2083, #2077, #2052 and #2073 together #6480