Merge pull request #2328 from apache/ken-in-tree