Backport #15317 to 2014.1