Merge "Revert "Unifying various model update callbacks into one"" into main