Backport #18218 to 2014.1

Backport #18218 to 2014.1