Merge branch 'js/refer-upstream'