Cm 10.1

merge changes from original ace config