Backport #15300 to 2014.1

Backport #15300 to 2014.1