Merge "Fix incorrect expectation about usage of bounds" into main