Backport #14913 to 2014.7

Backport #14913 to 2014.7