Backport #16008 to 2014.7

Backport #16008 to 2014.7