re-enable await_emu
Merge branch 'develop'