Upstream merge: conflict resolution and version bump