Merge branch 'jn/editor-pager'