merge in emu-2.3-release history after reset to emu-master-dev