Add v3.2.16 and v4.0.2