More work on bug #8030.  I fixed some issues, and made some optimizations.
Changed the version to alpha16