3.5 maintenance - Fix for 288211
12 files changed