[ORII-95]
well, my initial tests show it works with the given changes.. here's hoping it's true :-D