Merge branch 'jk/pager-swap'