Fix FORGE-1500
Merge branch 'master' of https://github.com/adamwy/core