Backport #15598 to 2014.7

Backport #15598 to 2014.7