merge queue: embarking main (2998b73), #941, #939 and #940 together

merge queue: embarking main (2998b73), #941, #939 and #940 together #526