Update to v2.3.6