Merge pull request #2403 from hbristow:issue-3451