Merge from jeffu231/EditorRenderingRevisited