Backport #14641 to 2014.7

Backport #14641 to 2014.7