Merge branch 'fc/transport-helper-sync-error-fix'