[HCT-10] #resolve