Upgrade F30 to F31