Branch 3.2.1 - Fix for 157389
2 files changed