upgrade to tag v2.3.6-1

upgrade to tag v2.3.6-1