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