SIP-6141 --resolve