Merge "Adding extra checks to bound linear block sizes" into main