Backport #11700 to 2014.1

Backport #11700 to 2014.1