Add v2.1 branch for keon