Merge "Add settings for SUW data control." into nyc-dev