Merge pull request #1376 from StephenMcConnel/bug-24109