Backport #18220 to 2014.1

Backport #18220 to 2014.1