Defer rebuilding until after save is complete.
Merge branch 'quiz'