Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0 * commit '8ad896e4e95e63af5aaec171424b809a7a939f78': REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行