Merge pull request 'fix bug' (#1587) from fix-1494 into V20220228