Code is now v2.9.9
Ready for v3.0.0 production