Backport #16648 to 2014.7

Backport #16648 to 2014.7