[HCT-9] #resolve