Backport #15848 to 2014.1

Backport #15848 to 2014.1