Merge branch 'sr/transport-helper-fix'