Merge pull request #13938 from annando/output-type