Merge "Move blast sync handling to BBQ"