Merge Zhinan from devel to master