1.9.x

Solve bug#7210