Backport #16797 to 2014.7

Backport #16797 to 2014.7