final updates for v1.20.22