Filed bug 1020573
Started work on bug 1020457