Merge pull request #1718 from mattcasters/master

HOP-4270