Merge "Add dataplane deploy setting"