enabled cookies for customerscreen via salorcapture
Merge branch 'upstream'
build