update to Fork 3.6