Merge thh changes.