Fixed failing tests after adding support for FORGE-879.
Implemented FORGE-862
Merge branch 'master' of git://github.com/forge/core into FORGE-862