Feature/issue 269 squash2 persist cookie