Merged with development ABC-HGT