Merge branch 'dev' into 'master' fix: select dropdown calcs thez- index See merge request quiqqer/qui!7