Backport #15915 to 2014.7

Backport #15915 to 2014.7