Merge branch 'dev' into 'master' Dev See merge request quiqqer/package-currency!5