Merge pull request #973 from Nordix/feature/GEODE-10076