Backport #15666 to 2014.7

Backport #15666 to 2014.7