Upgrade to CM 1.17