Merge pull request 'fix-3108' (#3214) from fix-3108 into V20221116