Applies patch from Issue: 3380628 by nginex
Issue #2978769 by Steven Buteneers, sanderjonk: Support different cookie categories Issue #3188523 by crmn, HitchShock: Lots of php notices