Merge "Make autoblocks update with the parent block"