Merge branch 'feature-WG-307b1' of http://repo.svi.cloud/WEBGDE-Components/web-ui into feature-WG-307b1
