Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev See merge request redmic-project/client/web!4