prep towards e4 based builds
8 files changed