reapplied r74493 (after #6665 fix has been backported)
3 files changed