3.5 maintenance - Fix for 286391
3 files changed