Merge branch 'fc/transport-helper-fixes'