Merge branch 'sb/prefix-path-free-results' into next