Merge "Add advanced extension support to emulator"