Update to 2.3.6