Fix for issue 14725 for 2.7 branch
3 files changed