merge queue: embarking main (489e356), #987, #989, #990, #991 and #992 together

merge queue: embarking main (489e356), #987, #989, #990, #991 and #992 together #2801