Backport #16886 to 2014.7

Backport #16886 to 2014.7