Fix FORGE-940 - I think
Merge branch '2.0' of github.com:forge/core into 2.0