Merge pull request #2447 from gerv/690725