merge queue: embarking main (f1446e7), #4007 and #2904 together

merge queue: embarking main (f1446e7), #4007 and #2904 together #46