port r78813 from trunk fixing #8089
3 files changed