Merge "Don't fire data change notification before the data is made consistent." into jb-dev