merge queue: embarking main (05a6a9c) and #2963 together

merge queue: embarking main (05a6a9c) and #2963 together #448