Upgrade scripts modified to be used with FA 2.1 and 2.2beta