Upgrading to Fork v3.7.1

Replacement of CommonCookie