Merge branch 'ew/build-time-pager-tweaks'