Merge "Fix session store logging"