[support] Upgrade from 7.16 to 7.22