Merge "Snap for 12447717 from 611e73525439e9caeeb30822b8a3870f87bd69bd to emu-35-3-release" into emu-35-3-release