Merge pull request #2447 from gerv/gerv-690725