confirm message modified
Merge branch 'master' into develop