Merge branch 'js/alias-p'