V8.0 - ready for merge