[TIMOB-16275] More tweaks to cookie management