Merge branch 'rr/feed-real-path-to-editor'