Merge "Sonar fix: LeafNode.java"