Merge alibaba and pass manual test.