3.6 maintenance - Fix for 324154
4 files changed