Integrated the latest editor pod.

Integrates the latest fixes from the editor pod.

/cc @sendhil