Merge pull request #9204 from jfrazelle/9056-rmi

Fix for rmi throws error "no such id".