Merge output-control branch into latest master

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