fix alignment
hard code grp and bin for HT
Merge branch 'master' into production