Merge branch 'js/alias' into next