Progress on bug 1107706