Backporting the changes made in revision 72880 as fix for Issue1424152.
4 files changed