merge queue: embarking main (8c97aff) and [#417 + #418] together

merge queue: embarking main (8c97aff) and [#417 + #418] together #949