Backport #16236 to 2014.7

Backport #16236 to 2014.7