Merge pull request 'fix-3470' (#3526) from fix-3470 into V20221228