Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile