Merge pull request #1447 from chrisvire/bug-25102