Edit, Fixes. issue: 937, 936, 932, 929