Backport #15739 to 2014.7

Backport #15739 to 2014.7