update to final 3.6.4