Final commit before Forge update