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