Fix for issue 14725 for 3.2 branch
3 files changed