Backport #18150 to 2014.1

Backport #18150 to 2014.1