Merge "TreeFormat - Removed problems triggering Sonar errors"