Solve bug #7208
Merge branch '7208' into 1.9.x