More work on bug #8138.
Changed the version to alpha22