9128412 Merge branch 'hotfix_0308' into 'master' Hotfix 0308 See merge request fe/saas/web!1576