Comment 7 for bug 1924185

I've targeted this to the next round of point releases, since our libraries who use the preferred name field consider the current behavior to be a bug.