Merge "Improve Range Checks on CellIdentity Classes"