FORGE-531 fix implemented for Forge 2