I believe that the branch on bug 1730758 may address both of the issues reported here. Specifically, I'm 99% sure about Kathy's, but I'm less sure about Robert's.
I believe that the branch on bug 1730758 may address both of the issues reported here. Specifically, I'm 99% sure about Kathy's, but I'm less sure about Robert's.