bug 5346 (in progress)
11 files changed