CON-21 #resolve