release 3.3.6
Merge branch 'dev'