Merge pull request 'fix-3262' (#3543) from fix-3262 into V20221228