change notify form
Merge branch 'dev'