Merge "Synchronizing model data access"