Merge branch 'V20220926' into point-v2