Merge "Add new internal resolve method"