merge from hltetmo