Merge "Sonar fix: TemplateNode.java"