Merge branch 'thgeneric'