Merge "Catch all data set changes"