merge queue: embarking main (6fd5c1b), #1024 and #1025 together

merge queue: embarking main (6fd5c1b), #1024 and #1025 together #146