Merge pull request alibaba#1178 from alibaba/developing

Developing

Merge pull request alibaba#1159 from alibaba/2.1.x

2.1.x

Merge pull request alibaba#1050 from alibaba/2.1.fix

2.1.fix

Merge pull request alibaba#1050 from alibaba/2.1.fix

2.1.fix

Merge pull request alibaba#1050 from alibaba/2.1.fix

2.1.fix

修复合并策略 空指针的问题

修复强制创建新行填充，只有一行数据会未填充的bug

修复强制创建新行填充，只有一行数据会未填充的bug

Merge pull request alibaba#796 from alibaba/2.1.x

2.1.x

Merge pull request alibaba#745 from alibaba/2.1.x

2.1.x