CUS-2 #resolve