Merge branch 'master' into feature/stabilization-temp

Conflicts:
	component/webui/src/main/resources/groovy/platform/webui/containers/UINavigationManagement.gtmpl