merge in emu-2.3-release history after reset to 33ccc0931891d242445b8a9c3850979d8a1f858a