Merge from upstream
Deal with upgrade