Fixes issue with cookie being generated for different paths
Merge remote-tracking branch 'origin/develop' into develop