Force merge from upstream.