Merge "Fix NPE in CDM UI" into sc-dev