Merge pull request #14083 from annando/issue-13812