Merge "Sonar fix: CUI.java"