Merge "copy auto-group decisions to updates" into nyc-dev