[Evegeny, Luis] fix data and change_data issues with data propagation