update 2.1 to afcc1e1