Backport #18177 to 2014.1

Backport #18177 to 2014.1