Update Shrinkwrap resolver to match WFK 2.3