Backport #18300 to 2014.1

Backport #18300 to 2014.1