Merge branch 'js/test-avoid-pipe'