Backport #16322 to 2014.7

Backport #16322 to 2014.7