Commit for merging with newer version of rina-sim