Harmonize with forge version
Resolved merge conflict