EB-6936 - FIX for errors on the Cart header. The initial commit
Merge remote-tracking branch 'upstream/master'