Merge commit '123d6f372fcd7bdc18245cac984005bab3d534af' * commit '123d6f372fcd7bdc18245cac984005bab3d534af': Fix a race condition for data change notification
Merge commit '123d6f372fcd7bdc18245cac984005bab3d534af' * commit '123d6f372fcd7bdc18245cac984005bab3d534af': Fix a race condition for data change notification