3.5 maintenance - Fix for 294662
2 files changed