Merge "Update CMD association flow."