Integrated the latest from the Editor pod.