Merge "Add a non-blast mode to sync-engine" into tm-qpr-dev