Fix FORGE-940
Further fixes for FORGE-940, committing to verify on *nix
Merge branch '2.0' of github.com:forge/core into 2.0