Backport #15029 to 2014.7

Backport #15029 to 2014.7