Merge pull request 'fix-2357' (#2589) from fix-2454 into V20220801