Merge branch 'thgeneric' into senslab2