Keep stable at 2.3.6 until testing complete