Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev