Version bump to v2.3.6