Merge in Ryan's Upgrade Check