I have moved the PAGE_XXX fixes into a separate PR (and it's assigned to you, what a surprise!). The rest of patch was not modified. Please have another look.