Fix for rmi throws error "no such id". Upstream-commit: 17dfa126baabb7300e4a5193689cde01ece24747 Component: engine