Merge branch 'release-3.3.6'