merge queue: embarking main (6c7f408), #513, #515, #516 and #517 together

merge queue: embarking main (6c7f408), #513, #515, #516 and #517 together #2426