Backport #16077 to 2014.7

Backport #16077 to 2014.7