merge queue: embarking main (ad96ed3), #5408, #5409 and #5410 together

merge queue: embarking main (ad96ed3), #5408, #5409 and #5410 together #6378