Issue #2: Fixing upgrade path with CMI.