Merge "Sonar fix: CreateDelete.java"