update 2.1 to fa19812