ROO-3471: Update to next version