merge queue: embarking main (ef67d43), #507, #512, #513, #515 and #516 together

merge queue: embarking main (ef67d43), #507, #512, #513, #515 and #516 together #2403