Recovery commit for RMI
Merge branch 'rmi' into develop
Merge branch 'staging'