Update delivery_mode default to non-persistent