[forge-commits] [forge/core] cbca11: Fix FORGE-940