Merge 65376 into 3k, fix for issue 3399
3 files changed