Merging Zhinan changes from QA to devel.