3.5 maintenance - Fix for 290273
4 files changed