Merge pull request #12643 from jmcclelland/issue320