fix bugs with paragraph edit mode
Merge branch 'master' into release