Extended CustomerContext cookie to store additional values and bug fixes