Backport #18222 to 2014.1

Backport #18222 to 2014.1