Merge branch 'page-refs' (page ref overflow)