Updated range to also cover Upgrade configs. To 22.0 to ease comparisons across releases if needed.
FYI @dhayden @gcallea