Integrated the latest from the editor pod.

Integrates the latest changes from the editor pod.

/cc @bummytime