D8
D8 core, disable includes
Merge branch 'f-D7-to-D8' into dev