Applied post 1.9.0 fixes

13 files changed