Backport #14781 to 2014.7

Backport #14781 to 2014.7