@dbu well, let's just do it this way and see how we do that after 1.1 stable :)