Backport #15030 to 2014.7

Backport #15030 to 2014.7