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

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