fixed cancel editing paragraphs
Merge branch 'master' into release