Merge branch '2020-08-21-stdio-cleanup'