Integrated the latest editor pod changes.