Merge branch 'dev' into 'next' Dev See merge request quiqqer/package-currency!21