Merge pull request 'fix-1913' (#2025) from fix-1913 into V20220428
