Merge pull request #146504 from flexagoon/emulator-fix
authored by Sandro and committed by GitHub 4 years ago a8ff9bca 4f0e1c04