Branch 3.2.1 - Fix for 157389
3 files changed