merge queue: embarking main (78dbbad) and [#596 + #597 + #598 + #599 + #601] together

merge queue: embarking main (78dbbad) and [#596 + #597 + #598 + #599 + #601] together #1430