Merge pull request 'fix-2764' (#2782) from fix-2764 into V20220830