Update Forge
Revert "Update Forge"

This reverts commit 87576cb3bb285964241a2b81e816ac0891bd2338.
Revert "Revert "Update Forge""

This reverts commit fa3334caf6593f50d95e8af488670eb69acb19fe.
Merge remote-tracking branch 'origin/4.0.5' into 4.1.0