Print more diagnostic info
Merge branch 'sync-logic' into test-sync