''rework-testing'' branch completed, see #8169 and #8170.
Authored by: cboos 2009-08-20
Parent: [r8475]
Child: [r8477]