Merge branch 'master' of gitlab.com:minds/engine into plus-fix.7022019