BUG-2794: incorporate ofjava instruction changes