[forge-commits] [forge/core] 7658c9: Fix FORGE-774