Merge "Make sessions aware of user id"