Merge "DO NOT MERGE: Move blast sync handling to BBQ" into sc-v2-dev