Backport #14810 to 2014.1 branch