Merge branch 'hotfix/smtp_fix'
Merge branch 'release/v0.11.0'
solved_incedents -> solved
Merge branch 'hotfix/solved' into develop