WIP patch bug 959694