Merge branch 'master' of gitlab.com:minds/front into feat/media-modal-1539