Backport #15986 to 2014.7