[3.8] Some fixes

- Fix #1272
- Fix #1275
- Fix #1280
- Fix #1289
- Fix #1292
- Fix #1295
- Fix #1337
- Fix #1335
- Fix #1329
- Fix #1330