Changes from upstream