Backport #15807 to 2014.7

Backport #15807 to 2014.7