Backport #15372 to 2014.7