Merge pull request #4621 from EmmanuelMess/emmanuelmess/ci/add_ondemand_emulator