Changes made from upstream