Fix 1315 page rebase r2

@jamie-cyber1 Please review and merge.