Merge pull request #5641 from dstftw/preserve-best-for-stdout-outtmpl