merge queue: embarking main (b579d49), #4135, #4209, #4213 and [#4219 + #4220] together

merge queue: embarking main (b579d49), #4135, #4209, #4213 and [#4219 + #4220] together #1808