Merge "Tweaks for superseded blob processing" into main