Merge branch 'jk/pager-in-use'