[forge-commits] [forge/core] 37e02d: Fix FORGE-1500