Merge "Bug 981: Fixed accidental shaddowing of data in Data Change Event."