Merge branch 'feature-AtlasServiceUpgrade' of gitlab.com:redmic-project/client/web into feature-AtlasServiceUpgrade