Merge branch 'release/3.3.4' into production
Merge tag 'v3.3.4'

3.3.4