Backport #15179 to 2014.7

Backport #15179 to 2014.7