- Properly track block update flags (actually fixes #5038)