my last changes merged upstream