Added some actions/filters
Merge branch 'feature/i18n' into develop