[forge-commits] [forge/core] 258452: Fix FORGE-1023