Comment 11 for bug 245964

Fix available in associated branch, tests appreciated before I submit since I want to fix related bugs in the same submission ( I derogate to the usual one-bug-one-fix rule because several bugs are closely related).