Backport #16035 to 2014.7

Backport #16035 to 2014.7