Backport #15676 to 2014.7

Backport #15676 to 2014.7