merge @rpierreye commit: 78252aa0ae572873122261d2dcc91e1045c30aea