Merge pull request #12019 from cotequeiroz/jamvm_host