Code

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