Merge "Snap for 8074862 from 9a22e3767c87139e83f8483fc2a3dc895a8f39dc to emu-31-stable-release" into emu-31-stable-release