Merge pull request 'fix-2050' (#2149) from fix-2050 into V20220601