Merge branch 'hotfix'
adapted toast timeout
Merge branch 'master' into develop