Backport #15119 to 2014.7

Backport #15119 to 2014.7