Update to latest CM v4