Merge remote-tracking branch 'origin/ningjing' into ningjing