[forge-commits] [forge/furnace] 2dfe59: Applied changes in core/FORGE-988 branch