Feature/issue 269 squashed persist cookie