Merge pull request 'fix 917' (#1070) from fix-917 into V20211213