RIO-59: rio submodules