merge queue: embarking main (ef0d48b) and [#826 + #827 + #829] together

merge queue: embarking main (ef0d48b) and [#826 + #827 + #829] together #58