Merge pull request 'fix-3058' (#3176) from fix-csh into V20221116