[forge-commits] [forge/core] 2d1bf6: Fix for FORGE-416