Backport latest CGP patchs (except varnish category)