Merge branch 'fc/transport-helper-error-reporting'