Backport #15036 to 2014.7

Backport #15036 to 2014.7