Update to latest CMD in v4 branch