OPENZAP-214 --resolve