Merge pull request 'V20220718.patch' (#2527) from V20220718.patch into V20220718