Further changes towards a dedicated RokkMedia branch