RIO-80: modules merge