Merge branch 'jc/ll-merge-expose-path' into next