update for 1.7.2
Pull common main and make 1.6.4 branch