Merge branch 'js/no-pager-shorthand'