[forge-commits] [forge/core] 8555d4: FORGE-620 fix