Seems we can do it as planned.
Not to be merged!
@chofmann @jeanvisagie @rkoehler @chhitz
implements #dsd-2797
