Backport the changes made in revision 74198, fixing the issue 1424152
4 files changed