Merge branch 'js/portable' into next