Backport #16144 to 2014.7

Backport #16144 to 2014.7