Continue work on bug 959694