Made compile against the latest version
Update for resolve changes currently in a pull request
Merged in resolve changes, made compile against Incoming