Merge pull request #1245 from StephenMcConnel/bug-22483