Merge "Sonar fix: Delg.java"