Update for #1024 Forge (Recommended Build)