Merge pull request #1634 from StephenMcConnel/bug-28025