Backport #15272 to 2014.7

Backport #15272 to 2014.7