v1.9.6 fixes additional problems in #3763