Merge branch 'jc/maint-add-sync-stat'