Merge branch 'pcru-editor' into spartan