Backport #16591 to 2014.7

Backport #16591 to 2014.7