Merge "Emulator: update development to 2362bfb6" into oc-dev