Backport #16815 to 2014.7

Backport #16815 to 2014.7