The reported problem was fixes. The rest is more complex and it is above the scope of this bug. It should be converted to a long term feature. Closing.