Upstream merge + squashed commit history