Fix for Issue 14725 for 3.3 branch.
3 files changed