Merge branch 'hotfix/grouped-col-chart-labels'
Merge branch 'release/v1.5.4'
fixed missed reference to resendActivationMail
Merge branch 'hotfix/fixed-activation-mail' into develop