Merge "CDS UI code changes"