chore(release): v3.3.6
Merge branch 'release-3.3.6' into develop