Backport #18771 to 2014.1

Backport #18771 to 2014.1