Update to 6.5-10 (Y. Delgado)