Merge "First step in unifying datachange events"