Comment 1 for bug 1510188

This will have to be covered by unit tests