Merge "Fix CDM `associate` shell command"