Merge branch 'pyx-huajiao'