Oops, too "type safe"
Merge branch 'return-view-path'