Merge "Snap for 12357483 from ccdc9c3e24c519bfa4832a66aa2e83a52c19f295 to emu-35-3-release" into emu-35-3-release