Merge branch 'next' into 'master' Next See merge request quiqqer/package-currency!22