Merge "Fixed sonar issue in CUI.java"