Merge branch 'en/combined-all-paths'