Backport #14839 to 2014.7

Backport #14839 to 2014.7