Merge "Add update flag notify to reset callback"