Merge pull request #4679 from EmmanuelMess/emmanuelmess/fix/emulator_3