MT#9733 MT#6243 adapt emergency test to mr3.4