accumulated post-1.4.0 fixes
8 files changed