Backport #16386 to 2014.7