Merge branch 'bn/http-cookiefile-config'