merge for deploy single-touch beta opt-in