More work on #7376.  It is mostly done now.  I just need to fix the select routine.
This should fix #7376.