Backport #15070 to 2014.7

Backport #15070 to 2014.7