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

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