Merge branch 'bs/stdio-undef-before-redef'