Issue #2416: CCUI