Merge "Add synchronized to make sure data correctness"