Fixed merge bug in H2T_Internal branch