ADD: Include translatable support
FIX: Remove unnecessary return statement
Merge branch 'release/3.3.0'
Merge tag '3.3.0' into develop

Release 3.3.0