merged RootTools 2.6 dev