Initial work on Bug 395013.
6 files changed