Backport #14732 to 2014.7

Backport #14732 to 2014.7

Backport #14747 to 2014.7