RIO and AIO changes
Merge pull request #537 from ambiata/topic/rio

RIO and AIO changes