Merge "Snap for 8403122 from 753dcc47fc92ebbbc17edfa1c45ab6c4a7339f0b to emu-31-release" into emu-31-release