Merge dbGeneration and some commits from cliTools to master