CE-2214 #resolve