Initial import from CM-10.1