Merge branch 'dev-844' into 'dev' Dev 844 See merge request quiqqer/quiqqer!12