bugid: 51621 -- introduce special cases for handling paragraph tags wrapping block quotes
Merge branch 'bugid-51621' into dev