Merge branch 'dev' into 'master' fix: quiqqer/products Closes See merge request quiqqer/products!2