Merge "Deprecate CellLocation Classes"