Update to CM 1.6.4