Merge "Page range validation edge case handling." into klp-dev