Merge branch 'hotfix/fix_copyright'

* hotfix/fix_copyright:
  fix
Merge branch 'develop'
add handling mail error
Merge branch 'master' into develop