Merge "Fix normal vector error when we use skin" into devel/master