3.6.x stream - Fix for 323693
4 files changed