V10.8 ready for merge