Merge branch 'master' into '1.4' Merge for Version 1.4.4 See merge request quiqqer/qui!12