Merge pull request 'fix-1956 1640  1597  2370' (#2540) from fix-1956 into V20220801