Backport #18161 to 2014.1

Backport #18161 to 2014.1