Merge branch 'fix-1941' of https