Re: #1703 - fix for logged in user with no cookies
Merge branch 'ticket-1703' into develop
Merge branch 'develop' into test