Merge "Implement "no-UI" flow in CDM"