3.6 maintenance - Fix for 306464
6 files changed