F1428

I removed non-related changes in upgrade-funcs