Merge "Also fix out of bounds access for normal read" into klp-dev