Merge branch 'V20230215' into zouap_static