Cookie Cleanup: HH and Pop now work correctly (no cookies used)
Merge branch 'jon' into sprint9