Pr for #7987

see #7987