[HCT-13] #resolve