Merge pull request #4552 from EmmanuelMess/emmanuelmess/fix/emulator_ci