Merge "Fixes in the page range selection and verification logic." into klp-dev