Backport #15600 to 2014.7

Backport #15600 to 2014.7