Merge "Snap for 5598178 from 96ca096489517bbdc4f55962f35fb3360b331532 to emu-29.0-release" into emu-29.0-release