Some fixes for bug #8073.
Changed the version to alpha6