Integrated the latest from the editor pod.