[support] Upgrade from 6.16 to 6.22 - should it break things badly?