Merge branch 'jc/pager-cat'