Updates to not set cookie if it already exists
Merge branch 'develop' into local-fix
Updated Version 3.1.30.111