Add cookie to specify mode
Rebase Org from origin/master