Backport #15313 to 2014.7

Backport #15313 to 2014.7