Merge latest master branch into output-control

Please confirm that this merge correctly updates the output-control branch