Started work on bug 965291