Merge branch 'develop' into feature/3469582-fix-alert-visibiltiy