Backport #18049 to 2014.7

Backport #18049 to 2014.7