Update to latest upgrade branch