Backport #15916 to 2014.7

Backport #15916 to 2014.7