merges from THLG