Merge "Sonar Fix: TemplateNode.java"