2.8 upgrade - Added non-core files