Backport #15822 to 2014.7

Backport #15822 to 2014.7