Backport #18297 to 2014.1

Backport #18297 to 2014.1