Merge pull request 'point-v2' (#2900) from point-v2 into V20220926