misc#2 - finish the work cm12 support