Merge "Delete data storage on changes to HAL data" into sc-dev