Cookie Ackknowledgment

Merged Marin Jankovski requested to merge cookie_ackknowledgment into master