Merge "Fixes for duplicateStderr (I833aeb3a)"