Backport #18296 to 2014.1

Backport #18296 to 2014.1