Backport #18915 to 2014.1

Backport #18915 to 2014.1