Update to 4.0.22
Merge branch 'release/4.0.22'