Fixed #7383 again.
Much work on bug #7396.  I am about half way there.
This fixes #7396.  It has all been updated.