Merge pull request 'fix issue' (#1764) from fix-1591 into V20220328