Work on bug #8362.  The first updates are in.