Bind: upstream version bump
Resolve conflict