[[Split portion of a mixed commit.]]
there are still bugs in the emulator core :( [[Split portion of a mixed commit.]]