Added additional cell types. Bug fixes.
Merge commit '3ab3a26cacd66e4f7acc4e4babe0be080c08103e' from upstream