Merge "Snap for 7453540 from 8cf53b3d4cb9ff7964fff8dfa924578b69172a68 to emu-30-release" into emu-30-release