[MERGE]: TF 1.0.18#69

zzangzzangguy merged 3 commits intodevPopPool/iOS:devfrom

seg1.0/seg2.0,4.0/FIXPopPool/iOS:seg1.0/seg2.0,4.0/FIXCopy head branch name to clipboard