Upstream change to block