Merge "Improve Range Checks on CellIdentity Classes" into qt-dev