Merge "Fixed issue with datachange"