Update to latest CMv4