Merged from mvo-vcell-cleanup-1-branch.