Merge "Use OO Methods for CellIdentity Instead of RTTI"