Merge "Refactor CellInfo Constructors"