Merge branch 'sg/complete-paths'