Backport #16965 to 2014.7

Backport #16965 to 2014.7