Merge "Fix CDM associate command"