merge queue: embarking main (6369852) and [#562 + #567 + #568 + #569 + #571] together

merge queue: embarking main (6369852) and [#562 + #567 + #568 + #569 + #571] together #1398