Merge branch 'jygaulier-1.21.2.3'
bump to version 1.22.0.1