Merge pull request #2075 from apache/jbilleter/bst-init-2.6

Merge pull request #2075 from apache/jbilleter/bst-init-2.6 #346