Revert "Revert back again to 3.6.9, I'm tired now.........."

This reverts commit ed10c03fcd5f3c457dce1b1661333e9757028d19.