Merge pull request 'fix-2834' (#2837) from fix-2834 into V20220908