3.5 maintenance - Fix for 288211
20 files changed