Merge branch 'V20220616.patch' into zouap